From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 1 Mar 1993 09:13:26 +0000 (+0000)
Subject: Don't include dispextern.h more than once.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~97090
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=a994e1613455c591db2350b0a94d8db62e79f3a0;p=emacs.git

Don't include dispextern.h more than once.
(INTERVAL_VISIBLE_P): NILP test was backwards.
---

diff --git a/src/intervals.h b/src/intervals.h
index 6635ed78bc0..a50e46c61b2 100644
--- a/src/intervals.h
+++ b/src/intervals.h
@@ -18,7 +18,9 @@ along with GNU Emacs; see the file COPYING.  If not, write to
 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #ifdef USE_TEXT_PROPERTIES
+#ifndef NORMAL_FACE
 #include "dispextern.h"
+#endif
 
 #define NULL_INTERVAL 0
 #define INTERVAL_DEFAULT NULL_INTERVAL
@@ -135,7 +137,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* Is this interval visible?  Replace later with cache access */
 #define INTERVAL_VISIBLE_P(i) \
-  (! NULL_INTERVAL_P (i) && ! NILP (Fmemq (Qinvisible, (i)->plist)))
+  (! NULL_INTERVAL_P (i) && NILP (Fmemq (Qinvisible, (i)->plist)))
 
 /* Is this interval writable?  Replace later with cache access */
 #define INTERVAL_WRITABLE_P(i) \